messageTray: Rename bannerBodyMarkup to useBodyMarkup in Notification object

I think the new name better reflects the effect of the property.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3173>

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 7e2be6558a5da186aac34a7b8d6bf74628630fea..c0b62d540ae5d4cef932df53407ccbf0f2db877f 100644 (file)
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -768,7 +768,7 @@ export const NotificationMessage = GObject.registerClass(
 class NotificationMessage extends MessageList.Message {
     _init(notification) {
         super._init(notification.source, notification.title, notification.body);
-        this.setUseBodyMarkup(notification.bannerBodyMarkup);
+        this.setUseBodyMarkup(notification.useBodyMarkup);
 
         this.notification = notification;
         this.datetime = notification.datetime;
@@ -805,7 +805,7 @@ class NotificationMessage extends MessageList.Message {
         this.setIcon(this._getIcon());
         this.setTitle(n.title);
         this.setBody(n.body);
-        this.setUseBodyMarkup(n.bannerBodyMarkup);
+        this.setUseBodyMarkup(n.useBodyMarkup);
     }
 
     vfunc_clicked() {

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 023e56f4dee9391778836c37055086b8961a6e82..0d03e254139a462cb2459baf05a4f56921365914 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -409,7 +409,7 @@ export const Notification = GObject.registerClass({
         this.privacyScope = PrivacyScope.USER;
         this.forFeedback = false;
         this.body = null;
-        this.bannerBodyMarkup = false;
+        this.useBodyMarkup = false;
         this.sound = null;
         this._soundPlayed = false;
         this.actions = [];
@@ -442,7 +442,7 @@ export const Notification = GObject.registerClass({
 
         this.title = title;
         this.body = banner;
-        this.bannerBodyMarkup = params.bannerMarkup;
+        this.useBodyMarkup = params.bannerMarkup;
 
         if (params.datetime)
             this.datetime = params.datetime;

diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 08f10da5314790f0fc2902666265781c65b29e6a..15a3a984eed5208c5a748fcd5b4476809cbc0d81 100644 (file)
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -142,7 +142,7 @@ const NotificationsBox = GObject.registerClass({
             let body = '';
             if (n.body) {
                 const bodyText = n.body.replace(/\n/g, ' ');
-                body = n.bannerBodyMarkup
+                body = n.useBodyMarkup
                     ? bodyText
                     : GLib.markup_escape_text(bodyText, -1);
             }